Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 30 Jan 2010 11:24:01 +0000 (11:24 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 30 Jan 2010 11:24:01 +0000 (11:24 +0000)

Trivial merge